@@ -13,8 +13,8 @@ android {
|
||
| 13 | 13 |
applicationId "ai.pai.client" |
| 14 | 14 |
minSdkVersion MIN_SDK_VERSION as int |
| 15 | 15 |
targetSdkVersion TARGET_SDK_VERSION as int |
| 16 |
- versionCode 1023 |
|
| 17 |
- versionName "1.0.23" |
|
| 16 |
+ versionCode 1024 |
|
| 17 |
+ versionName "1.0.24" |
|
| 18 | 18 |
buildConfigField "boolean","isDevMode","true" |
| 19 | 19 |
manifestPlaceholders = [CHANNEL_NAME: "guanwang"] |
| 20 | 20 |
|
@@ -138,13 +138,16 @@ public class GroupPhotoFragment extends BaseFragment implements GroupService.Gr |
||
| 138 | 138 |
Toast.makeText(getActivity(),R.string.photo_upload_success,Toast.LENGTH_SHORT).show(); |
| 139 | 139 |
case GroupService.GroupCommand.COMMAND_FETCH_PHOTOS: |
| 140 | 140 |
ArrayList<GroupPhotoItem> photoItems = (ArrayList<GroupPhotoItem>)response; |
| 141 |
- if(adapter!=null&& photoItems!=null){
|
|
| 141 |
+ if(adapter!=null&& photoItems!=null &&photoItems.size()>0){
|
|
| 142 |
+ if(!photoItems.get(0).groupId.equals(groupId)){
|
|
| 143 |
+ return; |
|
| 144 |
+ } |
|
| 142 | 145 |
LogHelper.d(TAG, "photoFragment onCommandCommitSuccess has new photos and update adapter :"+photoItems.size()); |
| 143 | 146 |
noPhotoLayout.setVisibility(View.GONE); |
| 144 | 147 |
adapter.addGroupPhotoItems(photoItems); |
| 145 | 148 |
} |
| 146 | 149 |
noPhotoLayout.setVisibility(adapter.getPhotoList().size()==0 ? View.VISIBLE : View.GONE); |
| 147 |
- if(isAdded()){
|
|
| 150 |
+ if(isAdded() && adapter.getPhotoList().size()==0){
|
|
| 148 | 151 |
if(getActivity() instanceof GroupActivity){
|
| 149 | 152 |
GroupActivity groupActivity = (GroupActivity)getActivity(); |
| 150 | 153 |
groupActivity.showGuideAnim(); |